Fix for Solaris compile/output for VBDs in xentop.

Signed-off-by: John Levon <john.levon@sun.com>

diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
index 170b5c4caa4f87210d6639bc449eaad1379cfe21..faff532bfa2110930c7fff8dca5f210a848a7882 100644 (file)
--- a/tools/xenstat/xentop/xentop.c
+++ b/tools/xenstat/xentop/xentop.c
@@ -916,11 +916,19 @@ void do_vbd(xenstat_domain *domain)
        num_vbds = xenstat_domain_num_vbds(domain);
 
        for (i=0 ; i< num_vbds; i++) {
+               char details[20];
+
                vbd = xenstat_domain_vbd(domain,i);
-                               
-               print("VBD %4d [%2x:%2x]  OO: %8llu   RD: %8llu   WR: %8llu\n",
-                     xenstat_vbd_dev(vbd),
-                     MAJOR(xenstat_vbd_dev(vbd)), MINOR(xenstat_vbd_dev(vbd)),
+
+#ifdef __sun__
+               details[0] = '\0';
+#else
+               snprintf(details, 20, "[%2x:%2x] ", MAJOR(xenstat_vbd_dev(vbd)),
+                        MINOR(xenstat_vbd_dev(vbd)));
+#endif
+
+               print("VBD %4d %s OO: %8llu   RD: %8llu   WR: %8llu\n",
+                     xenstat_vbd_dev(vbd), details,
                      xenstat_vbd_oo_reqs(vbd),
                      xenstat_vbd_rd_reqs(vbd),
                      xenstat_vbd_wr_reqs(vbd));